Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: w3c/activitystreams
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: dd7e0e5934ef
Choose a base ref
...
head repository: w3c/activitystreams
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2551adbe7807
Choose a head ref
  • 2 commits
  • 4 files changed
  • 1 contributor

Commits on Oct 6, 2014

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    28260b7 View commit details
  2. Working to address

    #24 (comment)
    omment-58074056
    
    This does several things:
    
    1. It outlines a clearer separation between as:Object and as:Link
    2. It models as:Link in much the same way that hydra:Link is defined,
    using it as a marker to indicate that the @id is dereferencable
    3. It specifically handles the case where a JSON-LD object is defined
    as both an Object and a Link (e.g. "@type": ["as:Link",
    "urn:foo:object"])
    
    For anyone looking at this without JSON-LD glasses on, this might look
    strange, but it works. Compatibility with AS 1.0 is preserved and
    people who want to use the JSON only model (without the additional -LD
    stuff) can continue to do so without any additional complication.
    jasnell committed Oct 6, 2014
    Copy the full SHA
    2551adb View commit details
Showing with 167 additions and 109 deletions.
  1. +6 −1 activitystreams2-actions.html
  2. +4 −5 activitystreams2-context.jsonld
  3. +97 −76 activitystreams2-vocabulary.html
  4. +60 −27 activitystreams2.html
7 changes: 6 additions & 1 deletion activitystreams2-actions.html
Original file line number Diff line number Diff line change
@@ -133,7 +133,12 @@ <h2>Classes</h2>
<a href="activitystreams2-vocabulary.html#dfn-target">target</a> |
<a href="activitystreams2-vocabulary.html#dfn-instrument">instrument</a> |
<a href="activitystreams2-vocabulary.html#dfn-participant">participant</a> |
<a href="activitystreams2-vocabulary.html#dfn-priority">priority</a> | <a>confirm</a> | <a>using</a></code></p>
<a href="activitystreams2-vocabulary.html#dfn-priority">priority</a> |
<a href="activitystreams2-vocabulary.html#dfn-to">to</a> |
<a href="activitystreams2-vocabulary.html#dfn-bto">bto</a> |
<a href="activitystreams2-vocabulary.html#dfn-cc">cc</a> |
<a href="activitystreams2-vocabulary.html#dfn-bcc">bcc</a> |
<a>confirm</a> | <a>using</a></code></p>
<p><i>From <a href="activitystreams2-vocabulary.html#dfn-object"><code>Object</code></a></i>:<br/>
<code><a href="activitystreams2-vocabulary.html#dfn-language">language</a> | <a href="activitystreams2-vocabulary.html#dfn-displayName">displayName</a> | <a href="activitystreams2-vocabulary.html#dfn-alias">alias</a> | <a href="activitystreams2-vocabulary.html#dfn-author">author</a> | <a href="activitystreams2-vocabulary.html#dfn-content">content</a> |
<a href="activitystreams2-vocabulary.html#dfn-summary">summary</a> | <a href="activitystreams2-vocabulary.html#dfn-title">title</a> | <a href="activitystreams2-vocabulary.html#dfn-icon">icon</a> | <a href="activitystreams2-vocabulary.html#dfn-image">image</a> | <a href="activitystreams2-vocabulary.html#dfn-location">location</a> |
9 changes: 4 additions & 5 deletions activitystreams2-context.jsonld
Original file line number Diff line number Diff line change
@@ -8,7 +8,6 @@
"org": "http://www.w3.org/ns/org#",
"prov": "http://www.w3.org/ns/prov#",
"geo": "http://ld.geojson.org/vocab#",
"link": "http://www.iana.org/assignments/link-relations#",
"rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
"rdfs": "http://www.w3.org/2000/01/rdf-schema#",
"owl": "http://www.w3.org/2002/07/owl#"
@@ -682,25 +681,25 @@
{
"@id": "as:to",
"@type": "owl:ObjectProperty",
"rdfs:domain": "as:Activity",
"rdfs:domain": ["as:Activity", "as:PotentialAction"],
"rdfs:range": "as:Object"
},
{
"@id": "as:cc",
"@type": "owl:ObjectProperty",
"rdfs:domain": "as:Activity",
"rdfs:domain": ["as:Activity", "as:PotentialAction"],
"rdfs:range": ["as:Object", "as:Link"]
},
{
"@id": "as:bto",
"@type": "owl:ObjectProperty",
"rdfs:domain": "as:Activity",
"rdfs:domain": ["as:Activity", "as:PotentialAction"],
"rdfs:range": ["as:Object", "as:Link"]
},
{
"@id": "as:bcc",
"@type": "owl:ObjectProperty",
"rdfs:domain": "as:Activity",
"rdfs:domain": ["as:Activity", "as:PotentialAction"],
"rdfs:range": ["as:Object", "as:Link"]
},
{
Loading